GtkWindow: improve the inspector keybinding

Binding signals can return a boolean indicating whether they
handled the event. Use that here and return FALSE if the
inspector keybinding is disabled.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 8099f3a059f557cf4649b20bdf492d5c86882f36..22a95bfda1b10f7944b6cc48415c681ae609781d 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -416,7 +416,7 @@ static void gtk_window_real_set_focus     (GtkWindow         *window,
 static void gtk_window_real_activate_default (GtkWindow         *window);
 static void gtk_window_real_activate_focus   (GtkWindow         *window);
 static void gtk_window_keys_changed          (GtkWindow         *window);
-static void gtk_window_enable_debugging      (GtkWindow         *window,
+static gboolean gtk_window_enable_debugging  (GtkWindow         *window,
                                               gboolean           toggle);
 static gint gtk_window_draw                  (GtkWidget         *widget,
                                              cairo_t           *cr);
@@ -1208,6 +1208,8 @@ gtk_window_class_init (GtkWindowClass *klass)
    *
    * The default bindings for this signal are Ctrl-Shift-I
    * and Ctrl-Shift-D.
+   *
+   * Return: %TRUE if the key binding was handled
    */
   window_signals[ENABLE_DEBUGGING] =
     g_signal_new (I_("enable-debugging"),
@@ -1215,8 +1217,8 @@ gtk_window_class_init (GtkWindowClass *klass)
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkWindowClass, enable_debugging),
                   NULL, NULL,
-                  _gtk_marshal_VOID__BOOLEAN,
-                  G_TYPE_NONE,
+                  _gtk_marshal_BOOLEAN__BOOLEAN,
+                  G_TYPE_BOOLEAN,
                   1, G_TYPE_BOOLEAN);
 
   /*
@@ -11773,14 +11775,14 @@ inspector_keybinding_enabled (gboolean *warn)
   return enabled;
 }
 
-static void
+static gboolean
 gtk_window_enable_debugging (GtkWindow *window,
                              gboolean   toggle)
 {
   gboolean warn;
 
   if (!inspector_keybinding_enabled (&warn))
-    return;
+    return FALSE;
 
   if (toggle)
     {
@@ -11792,6 +11794,8 @@ gtk_window_enable_debugging (GtkWindow *window,
     }
   else
     gtk_window_set_debugging (TRUE, TRUE, warn);
+
+  return TRUE;
 }
 
 void

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 971609179ddc2ae57784e02af7083015a60ba846..687b312ba513bbda91723aeb223b1edc1b383376 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -80,7 +80,7 @@ struct _GtkWindowClass
   void     (* activate_focus)   (GtkWindow *window);
   void     (* activate_default) (GtkWindow *window);
   void    (* keys_changed)     (GtkWindow *window);
-  void    (* enable_debugging) (GtkWindow *window,
+  gboolean (* enable_debugging) (GtkWindow *window,
                                  gboolean   toggle);
 
   /*< private >*/